From: Markus Rost <rost@math.uni-bielefeld.de>
Date: Fri, 13 Dec 2002 22:41:40 +0000 (+0000)
Subject: (current-language-environment): Set type according to
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~29218
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4d94db277eb93d01552b773c5652ac43f7b155c5;p=emacs.git

(current-language-environment): Set type according to
`language-info-alist' also here.
---

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 508be261b1d..2ee7c484bea 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1505,8 +1505,14 @@ to using the function `set-language-environment'."
 			  current-language-environment)
 			language-info-alist))
 	     "English"))
-  ;; a better custom type will be set with `set-language-info'.
-  :type 'string
+  ;; custom type will be updated with `set-language-info'.
+  :type (if language-info-alist
+	    (cons 'choice (mapcar
+			   (lambda (lang)
+			     (list 'const (car lang)))
+			   (sort (copy-sequence language-info-alist)
+				 (lambda (x y) (string< (car x) (car y))))))
+	  'string)
   :initialize 'custom-initialize-default
   :group 'mule)